Fix the use case of popping from display property.
authorEli Zaretskii <eliz@gnu.org>
Sat, 2 Jul 2011 10:05:14 +0000 (13:05 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 2 Jul 2011 10:05:14 +0000 (13:05 +0300)
commit3f058de97ba1c868eee10899e4f170b727beeced
tree637d4c504f5f06361b3ff0ec72cf69a5ec24d5a0
parent27a28237e3379b577788ae48dc59ac90302cad74
Fix the use case of popping from display property.

 src/dispextern.h (struct iterator_stack_entry, struct it): New
 member from_disp_prop_p.
 src/xdisp.c (push_it, pop_it): Save and restore from_disp_prop_p.
 (handle_single_display_spec, push_display_prop): Set the
 from_disp_prop_p flag.
 (get_overlay_strings_1): Reset the from_disp_prop_p flag.
 (pop_it): Call iterate_out_of_display_property only if we are
 popping after iteration over a string that came from a display
 property.  Fix a typo in popping stretch info.  Add an assertion
 for verifying that the iterator position is in sync with the bidi
 iterator.
 (handle_single_display_spec, get_overlay_strings_1)
 (push_display_prop): Fix initialization of paragraph direction for
 string when that of the parent object is not yet determined.
doc/lispref/ChangeLog
doc/lispref/display.texi
src/ChangeLog
src/dispextern.h
src/xdisp.c